Minor Tweaks to design