diff --git a/css/DMSMainCMS.css b/css/DMSMainCMS.css
index 438cfbb..56209b3 100644
--- a/css/DMSMainCMS.css
+++ b/css/DMSMainCMS.css
@@ -1,4 +1,4 @@
-.ui-autocomplete { border: 1px solid #DDD; box-shadow: 0 1px 2px 0px #AFAFAF; }
+.ui-autocomplete { border: 1px solid #DDD; box-shadow: 0 1px 2px 0px #AFAFAF; max-height: 300px; overflow: scroll; }
 
 #Root_Documents { padding-left: 0; }
 #Root_Documents table { white-space: normal; }
@@ -16,16 +16,22 @@
 
 .ss-add .document-add-existing input { position: absolute; z-index: 9999; width: 390px; padding: 9px 7px; border-bottom-right-radius: 0; border-top-right-radius: 0; outline: none; box-sizing: border-box; }
 .ss-add .document-add-existing input[disabled] { color: #C0C0C2; text-shadow: 0 -1px 0 white; background: #EEE; background-image: none; box-shadow: inset 0 1px 8px 0 #C4C4C4; border-bottom-left-radius: 0; border-bottom-right-radius: 0; }
-.ss-add .document-add-existing .TreeDropdownField { border: none; width: 100%; max-width: 512px; box-sizing: border-box; cursor: pointer; overflow: hidden; margin-bottom: 20px; }
+.ss-add .document-add-existing .TreeDropdownField { border: none; width: 100%; max-width: 512px; box-sizing: border-box; cursor: pointer; overflow: hidden; }
 .ss-add .document-add-existing .treedropdownfield-toggle-panel-link { padding: 5px 9px 9px; border: 1px solid #B3B3B3; float: right; }
+.ss-add .document-add-existing .treedropdownfield-toggle-panel-link.treedropdownfield-open-tree { background: transparent; border: 1px solid #B3B3B3; border-bottom: none; border-bottom-right-radius: 0; }
 .ss-add .document-add-existing .treedropdownfield-title { width: auto; }
 .ss-add .document-add-existing .treedropdownfield-toggle-panel-link a { display: inline-block; top: 4px; position: relative; }
-.ss-add .document-add-existing .treedropdownfield-panel li:hover { cursor: pointer; }
+.ss-add .document-add-existing .treedropdownfield-panel { margin: -1px 0 0 0; box-sizing: border-box; }
+.ss-add .document-add-existing .treedropdownfield-panel ul { padding: 5px 0; }
+.ss-add .document-add-existing .treedropdownfield-panel ul li { border: 1px solid #ffffff; }
+.ss-add .document-add-existing .treedropdownfield-panel ul li:hover { border: 1px solid #CCC; border-radius: 4px; background: rgba(203, 203, 203, 0.4); cursor: pointer; }
+.ss-add .document-add-existing .treedropdownfield-panel ul li:hover a { outline: none; border: none; }
+.ss-add .document-add-existing .treedropdownfield-panel ul li a:hover { background: transparent; }
 .ss-add .document-add-existing .document-list { position: absolute; z-index: 9999; width: 510px; border: 1px solid #DDD; border-top: none; background: #ffffff; display: none; box-shadow: 0 2px 4px 1px #DDD; max-height: 300px; border-radius: 6px; background-clip: padding-box; overflow: scroll; }
 .ss-add .document-add-existing .document-list ul li { display: block; line-height: 18px; padding: 4px 8px; border: 1px solid #FFF; }
 .ss-add .document-add-existing .document-list ul li:hover { border: 1px solid #CCC; border-radius: 4px; background: rgba(203, 203, 203, 0.4); }
 
-@-moz-document url-prefix() { #Main_FromtheCMS .document-add-existing input { padding: 10px 7px; } }
+@-moz-document url-prefix() { .ss-add .document-add-existing input { padding: 10px 7px; } }
 
 #Form_EditForm_Documents { padding: 1em 0; }
 #Form_EditForm_Documents input[name="filter[LastChanged]"] { display: none; }
diff --git a/scss/DMSMainCMS.scss b/scss/DMSMainCMS.scss
index 2d93077..a310086 100644
--- a/scss/DMSMainCMS.scss
+++ b/scss/DMSMainCMS.scss
@@ -4,6 +4,8 @@ $gf_colour_zebra: #F0F4F7;
 .ui-autocomplete{
 	border: 1px solid #DDD;
 	box-shadow: 0 1px 2px 0px #AFAFAF;
+	max-height: 300px;
+	overflow: scroll;
 }
 
 #Root_Documents{
@@ -86,12 +88,18 @@ $gf_colour_zebra: #F0F4F7;
 			box-sizing: border-box;
 			cursor:pointer;
 			overflow:hidden;
-			margin-bottom: 20px;
+			//margin-bottom: 20px;
 		}
 		.treedropdownfield-toggle-panel-link{
 			padding: 5px 9px 9px;
 			border: 1px solid #B3B3B3;
 			float: right;
+			&.treedropdownfield-open-tree{
+				background:transparent;
+				border: 1px solid #B3B3B3;
+				border-bottom:none;
+				border-bottom-right-radius:0;
+			}
 		}
 		.treedropdownfield-title{
 			width: auto;
@@ -102,9 +110,27 @@ $gf_colour_zebra: #F0F4F7;
 			position: relative;
 		}
 		.treedropdownfield-panel{
-			li{
-				&:hover{
-					cursor: pointer;
+			margin: -1px 0 0 0;
+			box-sizing: border-box;
+			ul{
+				padding: 5px 0;
+				li{
+					border: 1px solid #ffffff;
+					&:hover{
+						border: 1px solid #CCC;
+						border-radius: 4px;
+						background: rgba(203, 203, 203, 0.4);
+						cursor: pointer;
+						a{
+							outline:none;
+							border: none;
+						}
+					}
+					a{
+						&:hover{
+							background:transparent;
+						}
+					}
 				}
 			}
 		}
@@ -141,7 +167,7 @@ $gf_colour_zebra: #F0F4F7;
 // Hack for Firefox to fix padding on adding document input. 
 // FF renders the size different and pushes it out by 2px compared to webkit
 @-moz-document url-prefix() {
-	#Main_FromtheCMS{
+	.ss-add{
 		.document-add-existing{
 			input{
 				padding: 10px 7px;