diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index e19ab3bfb..0cd330126 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -57,6 +57,7 @@ class Attribute extends AppModel {
                                             'attachment',
                                             'malware-sample',
                                             'link',
+                                            'description',
                                             'other')),
 			'message' => 'Options : md5, sha1, filename, ip, domain, email, url, regkey, AS, other, ...',
 			//'allowEmpty' => false,
@@ -67,6 +68,7 @@ class Attribute extends AppModel {
 		),
 		'category' => array(
 			'rule' => array('inList', array(
+							'Internal reference',
 			                'Payload delivery',
 		                    'Antivirus detection',
 		                    'Payload installation',
@@ -75,7 +77,8 @@ class Attribute extends AppModel {
 		                    'Registry keys modified',
 		                    'Network activity',
 		                    'Payload type',
-		                    'Attribution',
+		                    'Attribution',
+		                    'External analysis',
 		                    'Other',
 		                    '' // FIXME remove this once all attributes have a category. Otherwise sigs without category are not shown in the list
 		                )),
diff --git a/app/View/Attributes/add_attachment.ctp b/app/View/Attributes/add_attachment.ctp
index 157ffd95c..fdf67ac0f 100644
--- a/app/View/Attributes/add_attachment.ctp
+++ b/app/View/Attributes/add_attachment.ctp
@@ -11,7 +11,7 @@
         echo $this->Form->input('malware', array(
                 'type' => 'checkbox',
                 'checked' => false,
-                'after' => ' <i>(Every malware sample will be zipped with the password "infected")</i>',
+                'after' => '<br>Tick this box to neutralize the sample. Every malware sample will be zipped with the password "infected"',
         ));
 	?>
 	</fieldset>
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index d60ea61b4..4866f6119 100755
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -62,6 +62,7 @@
 		?></li>
 	    <?php endforeach; ?>
 	    </ul>
+	    <br/>
 	</div>
 	<?php endif; ?>