Start refactoring editor ui, add button helper