Sent design to client

- Lots of general fixes