diff --git a/res/layout/clipboard_history_entry.xml b/res/layout/clipboard_history_entry.xml
index 9d34a9ef3..f4104adf3 100644
--- a/res/layout/clipboard_history_entry.xml
+++ b/res/layout/clipboard_history_entry.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
-  <TextView android:id="@+id/clipboard_entry_text" style="@style/clipboardEntry"/>
-  <LinearLayout style="@style/clipboardEntryButtons">
-    <View android:id="@+id/clipboard_entry_paste" style="@style/clipboardEntryButton" android:background="@drawable/ic_clipboard_paste"/>
-    <View android:id="@+id/clipboard_entry_addpin" style="@style/clipboardEntryButton" android:background="@drawable/ic_clipboard_save"/>
-  </LinearLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+android:layout_width="match_parent" android:layout_height="match_parent"
+android:layout_weight="1" android:orientation="horizontal">
+    <TextView
+        android:id="@+id/clipboard_entry_text_sno" style="@style/clipboardEntry"
+        android:layout_width="wrap_content" android:layout_height="match_parent"
+        android:gravity="center_vertical" android:maxLines="1" />
+    <TextView
+        android:id="@+id/clipboard_entry_text" style="@style/clipboardEntry"
+        android:layout_width="0dp" android:layout_weight="150"
+        android:background="@drawable/rounded_corner" android:backgroundTint="#19FFEB3B"
+        android:maxLines="3" />
+    <LinearLayout style="@style/clipboardEntryButtons">
+        <View android:id="@+id/clipboard_entry_addpin" style="@style/clipboardEntryButton"
+            android:background="@drawable/ic_clipboard_save" />
+    </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/clipboard_pin_entry.xml b/res/layout/clipboard_pin_entry.xml
index 9cd8b2d31..d9c323835 100644
--- a/res/layout/clipboard_pin_entry.xml
+++ b/res/layout/clipboard_pin_entry.xml
@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
-  <TextView android:id="@+id/clipboard_pin_text" style="@style/clipboardEntry" android:maxLines="3"/>
-  <LinearLayout style="@style/clipboardEntryButtons">
-    <View android:id="@+id/clipboard_pin_paste" style="@style/clipboardEntryButton" android:background="@drawable/ic_clipboard_paste"/>
-    <View android:id="@+id/clipboard_pin_remove" style="@style/clipboardEntryButton" android:background="@drawable/ic_delete"/>
-  </LinearLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent" android:layout_height="wrap_content"
+    android:orientation="horizontal">
+    <TextView android:id="@+id/clipboard_pin_text_sno" style="@style/clipboardEntry"
+        android:layout_width="wrap_content" android:layout_height="match_parent"
+        android:gravity="center_vertical" android:maxLines="1" />
+    <TextView android:id="@+id/clipboard_pin_text" style="@style/clipboardEntry"
+        android:layout_width="0dp" android:layout_weight="150"
+        android:background="@drawable/rounded_corner"
+        android:backgroundTint="#19FFFFFF" android:maxLines="3"
+        android:padding="5dp" />
+    <LinearLayout style="@style/clipboardEntryButtons">
+        <View android:id="@+id/clipboard_pin_remove" style="@style/clipboardEntryButton"
+            android:background="@drawable/ic_delete" />
+    </LinearLayout>
 </LinearLayout>
diff --git a/src/main/res/drawable/rounded_corner.xml b/src/main/res/drawable/rounded_corner.xml
new file mode 100644
index 000000000..b05c47cd9
--- /dev/null
+++ b/src/main/res/drawable/rounded_corner.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <padding android:left="5dp" android:right="5dp" android:bottom="5dp" android:top="5dp" />
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/srcs/juloo.keyboard2/ClipboardHistoryView.java b/srcs/juloo.keyboard2/ClipboardHistoryView.java
index b4eb6fe0e..5b29840c3 100644
--- a/srcs/juloo.keyboard2/ClipboardHistoryView.java
+++ b/srcs/juloo.keyboard2/ClipboardHistoryView.java
@@ -85,40 +85,24 @@ public View getView(final int pos, View v, ViewGroup _parent)
     {
       if (v == null)
         v = View.inflate(getContext(), R.layout.clipboard_history_entry, null);
-      ((TextView)v.findViewById(R.id.clipboard_entry_text))
-        .setText(_history.get(pos));
+      String sno = Integer.toString(pos+1) + ".";
+      ((TextView)v.findViewById(R.id.clipboard_entry_text_sno))
+              .setText(sno);
+      TextView text_view = v.findViewById(R.id.clipboard_entry_text);
+      text_view.setText(_history.get(pos));
+      text_view.setOnClickListener(
+              new View.OnClickListener(){
+                @Override
+                public void onClick(View v){paste_entry(pos);}
+              }
+      );
+
       v.findViewById(R.id.clipboard_entry_addpin).setOnClickListener(
           new View.OnClickListener()
           {
             @Override
             public void onClick(View v) { pin_entry(pos); }
           });
-      v.findViewById(R.id.clipboard_entry_paste).setOnClickListener(
-          new View.OnClickListener()
-          {
-            @Override
-            public void onClick(View v) { paste_entry(pos); }
-          });
-      // v.findViewById(R.id.clipboard_entry_removehist).setOnClickListener(
-      //     new View.OnClickListener()
-      //     {
-      //       @Override
-      //       public void onClick(View v)
-      //       {
-      //         AlertDialog d = new AlertDialog.Builder(getContext())
-      //           .setTitle(R.string.clipboard_remove_confirm)
-      //           .setPositiveButton(R.string.clipboard_remove_confirmed,
-      //               new DialogInterface.OnClickListener(){
-      //                 public void onClick(DialogInterface _dialog, int _which)
-      //                 {
-      //                   _service.remove_history_entry(_history.get(pos));
-      //                 }
-      //               })
-      //           .setNegativeButton(android.R.string.cancel, null)
-      //           .create();
-      //         Utils.show_dialog_on_ime(d, v.getWindowToken());
-      //       }
-      //     });
       return v;
     }
   }
diff --git a/srcs/juloo.keyboard2/ClipboardPinView.java b/srcs/juloo.keyboard2/ClipboardPinView.java
index 93c934ab6..61322fa8c 100644
--- a/srcs/juloo.keyboard2/ClipboardPinView.java
+++ b/srcs/juloo.keyboard2/ClipboardPinView.java
@@ -111,14 +111,17 @@ public View getView(final int pos, View v, ViewGroup _parent)
     {
       if (v == null)
         v = View.inflate(getContext(), R.layout.clipboard_pin_entry, null);
-      ((TextView)v.findViewById(R.id.clipboard_pin_text))
-        .setText(_entries.get(pos));
-      v.findViewById(R.id.clipboard_pin_paste).setOnClickListener(
-          new View.OnClickListener()
-          {
-            @Override
-            public void onClick(View v) { paste_entry(pos); }
-          });
+      String sno = Integer.toString(pos+1) + ".";
+      ((TextView)v.findViewById(R.id.clipboard_pin_text_sno))
+              .setText(sno);
+      TextView text_view = v.findViewById(R.id.clipboard_pin_text);
+      text_view.setText(_entries.get(pos));
+      text_view.setOnClickListener(
+              new View.OnClickListener(){
+                @Override
+                public void onClick(View v){paste_entry(pos);}
+              }
+      );
       v.findViewById(R.id.clipboard_pin_remove).setOnClickListener(
           new View.OnClickListener()
           {