diff --git a/services/web/app/views/project/editor/file-tree.jade b/services/web/app/views/project/editor/file-tree.jade
index b26af79191..d1962a0cff 100644
--- a/services/web/app/views/project/editor/file-tree.jade
+++ b/services/web/app/views/project/editor/file-tree.jade
@@ -119,6 +119,7 @@ script(type='text/ng-template', id='entityListItemTemplate')
 				ng-dblclick="startRenaming()"
 				draggable
 				droppable
+				accept=".entity-name"
 				on-drop-callback="onDrop"
 			)
 				div(
@@ -232,6 +233,7 @@ script(type='text/ng-template', id='entityListItemTemplate')
 				ng-if="entity.type == 'folder'"
 				ng-show="expanded"
 				droppable
+				accept=".entity-name"
 				on-drop-callback="onDrop"
 			)
 				file-entity(
diff --git a/services/web/public/coffee/app/ide/directives/layout.coffee b/services/web/public/coffee/app/ide/directives/layout.coffee
index 472c591f90..188b10edc9 100644
--- a/services/web/public/coffee/app/ide/directives/layout.coffee
+++ b/services/web/public/coffee/app/ide/directives/layout.coffee
@@ -10,7 +10,7 @@ define [
 					spacing_open: 24
 					spacing_closed: 24
 					onresize: () =>
-						scope.$broadcast "layout:#{name}:resize"
+						scope.$broadcast "layout:resize"
 
 				# Restore previously recorded state
 				if (state = $.localStorage("layout.main"))?
diff --git a/services/web/public/coffee/app/ide/editor/directives/aceEditor.coffee b/services/web/public/coffee/app/ide/editor/directives/aceEditor.coffee
index 246a6574f6..3c777665b0 100644
--- a/services/web/public/coffee/app/ide/editor/directives/aceEditor.coffee
+++ b/services/web/public/coffee/app/ide/editor/directives/aceEditor.coffee
@@ -58,6 +58,14 @@ define [
 				editor.commands.removeCommand "showSettingsMenu"
 				editor.commands.removeCommand "foldall"
 
+				scope.$on "layout:resize", () ->
+					console.log "LAYOUT RESIZED"
+					editor.resize()
+
+				$(window).on "resize", () ->
+					console.log "WINDOW RESIZED"
+					editor.resize()
+
 				editor.on "changeSelection", () ->
 					cursor = editor.getCursorPosition()
 					scope.$apply () ->
@@ -91,6 +99,9 @@ define [
 				scope.$watch "text", (text) ->
 					if text?
 						editor.setValue(text, -1)
+						session = editor.getSession()
+						session.setUseWrapMode(true)
+						session.setMode(new LatexMode())
 
 				scope.$watch "readOnly", (value) ->
 					editor.setReadOnly !!value
diff --git a/services/web/public/coffee/app/ide/file-tree/controllers/FileTreeFolderController.coffee b/services/web/public/coffee/app/ide/file-tree/controllers/FileTreeFolderController.coffee
index d9a7d6bda3..93daaae1f5 100644
--- a/services/web/public/coffee/app/ide/file-tree/controllers/FileTreeFolderController.coffee
+++ b/services/web/public/coffee/app/ide/file-tree/controllers/FileTreeFolderController.coffee
@@ -10,6 +10,7 @@ define [
 
 		$scope.onDrop = (events, ui) ->
 			source = $(ui.draggable).scope().entity
+			return if !source?
 			ide.fileTreeManager.moveEntity(source, $scope.entity)
 
 		$scope.orderByFoldersFirst = (entity) ->
diff --git a/services/web/public/coffee/app/ide/file-tree/directives/droppable.coffee b/services/web/public/coffee/app/ide/file-tree/directives/droppable.coffee
index 1a2eb5834b..ba087aa49a 100644
--- a/services/web/public/coffee/app/ide/file-tree/directives/droppable.coffee
+++ b/services/web/public/coffee/app/ide/file-tree/directives/droppable.coffee
@@ -10,5 +10,6 @@ define [
 				element.droppable
 					greedy: true
 					hoverClass: "droppable-hover"
+					accept: attrs.accept
 					drop: scope.onDropCallback
 		}
\ No newline at end of file