UI tweaks and fixes