Update to designs and tweaks throughout