Some UI tweaks to clean it up