Some UI tweaks for fun :D Can keep it if everyone likes it...