Some design tweaks.