Develop

Merge new UI into master