merging layout.jade & index.jade into editor.jade + cleanup