UI tweaks and bugfixes