--- a/integration/css/annotation-article.css	Wed Jun 19 18:28:56 2013 +0200
+++ b/integration/css/annotation-article.css	Tue Jun 25 18:46:43 2013 +0200
@@ -1,3 +1,9 @@
+input::-moz-focus-inner /*Remove button padding in FF*/
+{ 
+    border: 0;
+    padding: 0;
+}
+
 /* TOP BAR */
 
 .periplus-barre {
@@ -100,20 +106,37 @@
 
 .annotation-frame {
     position: absolute; float: left; clear: both; display: none; border: 2px solid;
-    margin: -4px 0 0 -4px;
+    margin: -4px 0 0 -4px; box-shadow: 0 0 4px #000000;
 }
 .annotation-area {
     float: left; clear: both; width: 490px; padding: 2px; opacity: .2;
 }
 .annotation-form {
-    float: left; clear: both; width: 490px; padding: 2px; background: rgba(200,200,200,.8);
+    float: left; clear: both; width: 490px; padding: 2px; background: rgba(200,200,200,.9);
 }
 .annotation-form h3 {
-    color: #197CAA; font-size: 14px; font-weight: bold;
+    color: #197CAA; font-size: 14px; font-weight: bold; margin: 2px 5px 0;
 }
 .annotation-textarea {
     margin: 5px; height: 120px; resize: none; border: 1px solid #666; padding: 2px; width: 474px;
 }
+ul.annotation-tags-form {
+    font-size: 12px; margin: 5px; border-radius: 0; border: 1px solid #666;
+}
+.annotation-submit, .annotation-remove {
+    width: 235px; height: 20px; line-height: 20px; font-size: 14px;
+    padding: 0; margin: 5px; color: #ffffff; font-weight: bold; border: none;
+}
+.annotation-submit:hover, .annotation-remove:hover {
+    opacity: .8;
+}
+.annotation-submit {
+    background: #197CAA;
+}
+.annotation-remove {
+    background: #990000;
+}
+
 .annotation-list li {
     margin-bottom: 5px; border: 2px solid; padding: 0 4px; font-size: 13px; cursor: hand;
 }
@@ -124,7 +147,7 @@
     margin: 4px 0;
 }
 .annotation-list li.selected {
-    background: #f8f8f8;
+    background: #e0e0e0;
 }
 .annotation-text {
     font-style: italic; color: #666;
@@ -141,7 +164,7 @@
 }
 
 .annotation-frame-box div {
-    position: absolute; background: rgba(128,128,128,0.5);
+    position: absolute; background: rgba(200,200,200,0.5);
 }
 
 .annotation-fb-top {
@@ -158,4 +181,4 @@
 
 .annotation-fb-bottom {
     left: 0; right: 0;
-}
\ No newline at end of file
+}