Updates to design and stuff