Final design tweaks