Some tweaks to make the UI less eye-stabby