7 files changed, 89 insertions, 51 deletions

diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
index 93578ec1..9c85c6b5 100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
@@ -12,7 +12,11 @@
     padding-left:15px;
     padding-bottom:15px;
     color:#ffffff;
-    background-color:#313131;
+    background-color:#494949;
+    font-family: 'Droid Sans', sans-serif;
+    border-radius: 8px;
+        box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
+        text-shadow: 1px 1px 1px #000;
 }
 
 .picker .pickerHeader{
@@ -20,7 +24,7 @@
 }
 
 .picker .container{
-    border: 1px groove #000000;
+    border: 1px solid #000000;
     overflow: auto;
     background-color:#5f5f5f;
 }
@@ -39,21 +43,26 @@
     width:75%;
     height:88%;
     overflow: hidden;
+    border-left: none;
 }
 
 .picker .right-top{
-    border: 1px groove #000000;
+    border-right: 1px solid #000000;
     overflow: auto;
     min-height:150px;
     height:75%;
     width:auto;
+    border-right: none;
 }
 
 .picker .right-bottom{
-    border: 1px groove #000000;
+    border: 1px solid #000000;
+    border-left: none;
     overflow: auto;
     height:20%;
     padding: 10px;
+    border-bottom: none;
+    border-right: none;
 }
 
 .picker .driversList{
@@ -194,8 +203,16 @@
     pointer:auto;
 }
 
+.picker .buttons button {
+        float: left;
+        width: 100px;
+        margin-top: 3px;
+}
+
 .picker .okButton{
-    margin-right:25px;
+        margin: 0px 22px 0px 8px; 
+    /*
+margin-right:25px;
     -webkit-box-align: center;
     text-align: center;
     cursor: default;
@@ -206,10 +223,12 @@
     border-radius:10px;
     background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);
     cursor:pointer;
+*/
 }
 
 .picker .cancelButton{
-    -webkit-box-align: center;
+    /*
+-webkit-box-align: center;
     text-align: center;
     cursor: default;
     padding: 0px 6px 0px;
@@ -219,6 +238,7 @@
     border-radius:10px;
     background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);
     cursor:pointer;
+*/
 }
 
 .picker input[type="button"]:disabled{
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html
index bd427f97..20cb0c68 100755
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html
@@ -67,8 +67,8 @@
         <div id="right-bottom" class="right-bottom"></div>
     </div>
     <div class="buttons">
-        <input id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" />
-        <input id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" />
+        <button id="cancelButton" value="CANCEL" class="cancelButton nj-skinned">Cancel</button>
+        <button id="okButton" disabled="true" value="OK" class="okButton nj-skinned">Ok</button>
     </div>
     <div id="filters" class="filters" style="display:block;">
         <div class="dropdown hide"></div>
diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index 520906ab..ac556c2d 100755
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -4,11 +4,14 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-var Montage = require("montage/core/core").Montage,
-    baseDocumentModule = require("js/io/document/base-document"),
-    NJUtils = require("js/lib/NJUtils").NJUtils;
-
-var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.BaseDocument, {
+////////////////////////////////////////////////////////////////////////
+//
+var Montage =           require("montage/core/core").Montage,
+    BaseDocument =      require("js/io/document/base-document").BaseDocument,
+    NJUtils =           require("js/lib/NJUtils").NJUtils;
+////////////////////////////////////////////////////////////////////////
+//
+exports.HTMLDocument = Montage.create(BaseDocument, {
     // PRIVATE MEMBERS
     _selectionExclude: { value: null, enumerable: false },
     _htmlTemplateUrl: { value: "user-document-templates/montage-application-cloud/index.html", enumerable: false},
@@ -477,32 +480,13 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
                 //TODO: Add code view logic and also styles for HTML
                 if (this.currentView === 'design') {
                         return {mode: 'html', document: this._userDocument, style: this._styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
-                } else if(this.currentView === "code"){
+                } else if (this.currentView === "code"){
                         //TODO: Would this get call when we are in code of HTML?
+                } else {
+                        //Error
                 }
         }
         }
         ////////////////////////////////////////////////////////////////////
         ////////////////////////////////////////////////////////////////////
-        
-        
-    /*
-save:{
-        value:function(){
-            try{
-                if(this.currentView === "design"){
-                    //generate html and save
-                }else if((this.currentView === "code") && (this.codeViewDocument !== null)){
-                    this.codeViewDocument.editor.save();
-                    //persist to filesystem
-                }
-                this.dirtyFlag=false;
-            }catch(e){
-                console.log("Error while saving "+this.uri);
-                console.log(e.stack);
-            }
-        }
-    }
-*/
-
 });
\ No newline at end of file
diff --git a/js/io/document/text-document.js b/js/io/document/text-document.js
index e149c479..87fcc551 100755
--- a/js/io/document/text-document.js
+++ b/js/io/document/text-document.js
@@ -10,7 +10,7 @@ var Montage = 		require("montage/core/core").Montage,
         BaseDocument =  require("js/io/document/base-document").BaseDocument;
 ////////////////////////////////////////////////////////////////////////
 //
-var TextDocument = exports.TextDocument = Montage.create(BaseDocument, {
+exports.TextDocument = Montage.create(BaseDocument, {
     // PRIVATE MEMBERS
     _codeEditor: {
         value: {
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css
index 092ca626..e79082a6 100755
--- a/