Tweaks to design