Fixed some layout issues on editor
Merge branch 'master' of https://github.com/Adgile/Adgile
stuff
asdf