--- a/integration/css/annotation-article.css	Tue Jun 25 18:46:43 2013 +0200
+++ b/integration/css/annotation-article.css	Thu Jun 27 18:11:11 2013 +0200
@@ -112,26 +112,30 @@
     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,.9);
+    float: left; clear: both; width: 480px; padding: 7px; background: rgba(200,200,200,.9);
 }
 .annotation-form h3 {
-    color: #197CAA; font-size: 14px; font-weight: bold; margin: 2px 5px 0;
+    color: #197CAA; font-size: 14px; font-weight: bold; margin: 2px 0 0;
 }
 .annotation-textarea {
-    margin: 5px; height: 120px; resize: none; border: 1px solid #666; padding: 2px; width: 474px;
+    height: 120px; resize: none; border: 1px solid #666; padding: 2px; width: 472px;
 }
 ul.annotation-tags-form {
-    font-size: 12px; margin: 5px; border-radius: 0; border: 1px solid #666;
+    font-size: 12px; border-radius: 0; border: 1px solid #666; margin-bottom: 5px;
+}
+.annotation-tags li {
+    float: left; padding: 2px; border: 1px solid #666; background: #cccccc; border-radius: 3px; margin-right: 2px;
 }
-.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, a.annotation-remove {
+    width: 235px; height: 20px; line-height: 20px; font-size: 14px; text-align: center;
+    padding: 0; margin: 0; color: #ffffff; font-weight: bold; border: none; font-family: Arial, Helvetica, sans-serif;
+    float: left;
 }
 .annotation-submit:hover, .annotation-remove:hover {
     opacity: .8;
 }
 .annotation-submit {
-    background: #197CAA;
+    background: #197CAA; margin-left: 10px;
 }
 .annotation-remove {
     background: #990000;
@@ -159,6 +163,12 @@
     color: #ffffff;
     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQImWNgYGD4DwABBAEAfbLI3wAAAABJRU5ErkJggg==) !important;
 }
+
+.add-annotation {
+    position: absolute; background: #197CAA; color: #fffff; padding: 6px; border-radius: 3px;
+    font-size: 14px; font-weight: bold; color: #ffffff; cursor: hand; display: none;
+}
+
 .annotation-frame-box {
     display: none;
 }