Some design tweaks