diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py
--- a/rhodecode/controllers/files.py
+++ b/rhodecode/controllers/files.py
@@ -317,6 +317,10 @@ class FilesController(BaseRepoController
                 h.flash(_('No content'), category='warning')
                 return redirect(url('changeset_home', repo_name=c.repo_name,
                                     revision='tip'))
+            if not filename:
+                h.flash(_('No filename'), category='warning')
+                return redirect(url('changeset_home', repo_name=c.repo_name,
+                                    revision='tip'))                
 
             try:
                 self.scm_model.create_node(repo=c.rhodecode_repo,
diff --git a/rhodecode/templates/files/files_add.html b/rhodecode/templates/files/files_add.html
--- a/rhodecode/templates/files/files_add.html
+++ b/rhodecode/templates/files/files_add.html
@@ -46,6 +46,7 @@
                             </div>
                             <div class="input">
                                 <input type="text" value="${c.f_path}" size="30" name="location" id="location">
+                                ${_('use / to separate directories')}
                             </div>
                          </div>
                                       
@@ -62,7 +63,7 @@
 			<div id="body" class="codeblock">
 			    <pre id="editor_pre"></pre>
 				<textarea id="editor" name="content" style="display:none"></textarea>
-				<div style="padding-top: 10px;">${_('commit message')}</div>
+				<div style="padding: 10px;color:#666666">${_('commit message')}</div>
 				<textarea id="commit" name="message" style="height: 100px;width: 99%"></textarea>
 			</div>
 			<div style="text-align: right;padding-top: 5px">
diff --git a/rhodecode/templates/files/files_edit.html b/rhodecode/templates/files/files_edit.html
--- a/rhodecode/templates/files/files_edit.html
+++ b/rhodecode/templates/files/files_edit.html
@@ -41,10 +41,8 @@
 			<div id="body" class="codeblock">
 			    <pre id="editor_pre"></pre>
 				<textarea id="editor" name="content" style="display:none">${c.file.content|n}</textarea>
-				
-				<div style="padding-top: 10px;">${_('commit message')}</div>
+				<div style="padding: 10px;color:#666666">${_('commit message')}</div>
 				<textarea id="commit" name="message" style="height: 100px;width: 99%"></textarea>
-				
 			</div>
 			<div style="text-align: right;padding-top: 5px">
 			<input id="reset" type="button" value="${_('Reset')}" class="ui-button-small" />