Visual tweaks and simplifications