Develop

Lots of design changes from develop