More UI tweaks and comments