Minor tweaks to design