Design and styling tweaks