diff --git a/view/settings.tpl b/view/settings.tpl
index dfa9e50399..25f570be6e 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -1,11 +1,11 @@
 <h1>$ptitle</h1>
 
+$nickname_block
+
 <div id="plugin-settings-link"><a href="settings/addon">$lbl_plug</a></div>
 
 $uexport
 
-$nickname_block
-
 
 <form action="settings" id="settings-form" method="post" autocomplete="off" >
 
diff --git a/view/settings_nick_set.tpl b/view/settings_nick_set.tpl
index 4378b4884d..1b0766099a 100644
--- a/view/settings_nick_set.tpl
+++ b/view/settings_nick_set.tpl
@@ -1,7 +1,7 @@
 
 <div id="settings-nick-wrapper" >
 <p id="settings-nickname-desc">
-<span class="error-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</span>
+<div class="error-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</div>
 </p>
 </div>
 <div id="settings-nick-end" ></div>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 5f8f06a6c6..4c9f389e2c 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -383,7 +383,7 @@ input#dfrn-url {
 
 #settings-nick-wrapper {
 	margin-top: 20px;
-	margin-bottom: 30px;
+
 }
 
 #settings-expire-end {
@@ -506,10 +506,6 @@ input#dfrn-url {
 	width: 500px;
 }
 
-#settings-nick {
-	margin-bottom: 50px;
-}
-
 #cropimage-wrapper, #cropimage-preview-wrapper {
 	float: left;
 	padding: 30px;
@@ -2126,11 +2122,15 @@ a.mail-list-link {
 }
 
 
-#plugin-settings-link, #account-settings-link, #uexport-link {
+#plugin-settings-link, #account-settings-link {
 	margin-bottom: 10px;
 }
 
-/* end from defautlt */
+#uexport-link {
+	margin-bottom: 20px;
+}
+
+/* end from default */
 	
 
 .fn {