Minor appearence and UI tweaks