Cleaning up the editor UI a bit more