Update design and fix any problems