Small design tweaks