Move last UI stuff to ui.el