diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index ad8762167b5423627aeb0d014b4fe7a25a97b6e1..54edf16397012371a8c930b28f7bf153d97e594c 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -26,7 +26,7 @@
 #contacts_propertymenu li a { padding: 3px; display: block }
 #contacts_propertymenu li:hover { background-color: #1d2d44; }
 #contacts_propertymenu li a:hover { color: #fff }
-#card { width: auto;/*max-width: 70em; border: thin solid lightgray; display: block;*/ }
+#card { width: auto; font-size: 10px; /*max-width: 70em; border: thin solid lightgray; display: block;*/ }
 #firstrun { width: 100%; position: absolute; top: 5em; left: 0; text-align: center; font-weight:bold; font-size:1.5em; color:#777; }
 #firstrun #selections { font-size:0.8em; margin: 2em auto auto auto; clear: both; }
 
@@ -71,9 +71,9 @@ label:hover, dt:hover { color: #333; }
 #fn { float: left !important; width: 18em !important; }
 #name { /*position: absolute; top: 0px; left: 0px;*/ min-width: 25em; height: 2em; clear: right; display: block; }
 #identityprops { /*position: absolute; top: 2.5em; left: 0px;*/ }
-/*#contact_photo { max-width: 250px; }*/
+#contact_photo { float: left; margin: 1em; }
 #contact_identity { min-width: 30em; }
-.contactsection { position: relative; float: left; padding: 0.5em; height: auto; }
+.contactsection { position: relative; float: left; width: 35em; padding: 0.5em; height: auto; }
 
 #cropbox { margin: auto; }
 #contacts_details_photo_wrapper { width: 200px; }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index f535dc03f3f9693903f7154893deceee5545f7d9..fda47665c909d249df37cbeb5e6dcaa0681baf26 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -545,13 +545,13 @@ OC.Contacts={
 				textarea.css('min-height', nheight+'em');
 				textarea.attr('rows', nheight);
 				textarea.val(txt);
-				note.show();
+				$('#contact_note').show();
 				textarea.expandingTextarea();
 				$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().hide();
 			} else {
 				note.removeData('checksum');
 				note.find('textarea').val('');
-				note.hide();
+				$('#contact_note').hide();
 				$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().show();
 			}
 		},
@@ -788,6 +788,7 @@ OC.Contacts={
 				case 'NOTE':
 					$('#contacts_propertymenu_dropdown a[data-type="'+type+'"]').parent().hide();
 					$('#note').find('textarea').expandingTextarea().show().focus();
+					$('#contact_note').show();
 					break;
 				case 'EMAIL':
 					if($('#emaillist>li').length == 1) {
@@ -838,6 +839,7 @@ OC.Contacts={
 									OC.Contacts.Card.loadPhoto();
 								} else if(proptype == 'NOTE') {
 									$('#note').find('textarea').val('');
+									$('#contact_note').hide();
 									OC.Contacts.propertyContainerFor(obj).hide();
 								}
 							} else {
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 4d465e418cf8412e3f99a178d53589a83adbb57f..1f85f656874b88aff0928faa9c58850e888b1ba3 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -11,7 +11,7 @@ $id = isset($_['id']) ? $_['id'] : '';
 		<input id="file_upload_start" type="file" accept="image/*" name="imagefile" />
 	</form>
 
-	<div id="contact_photo" class="contactsection">
+	<div id="contact_photo">
 
 	<iframe name="file_upload_target" id='file_upload_target' src=""></iframe>
 	<div class="tip propertycontainer" id="contacts_details_photo_wrapper" title="<?php echo $l->t('Drop photo to upload'); ?> (max <?php echo $_['uploadMaxHumanFilesize']; ?>)" data-element="PHOTO">