Design tweaks all over the place