Style tweaks all around