Small tweaks to design