Did some UI tweaks