Various UI tweaks to use the new defaults