More UI tweaks, more better visuals