Minor bugfixes and UI work