Major UI tweaks #42