Tweaks to the design