A couple final tweaks to design