More UI tweaks and polishing