Further design tweaks