Editor Design fixes

Closes #380