More UI tweaks and bugfixes