UI cleanup for the editor; TODO: Fix layering again.