New design

Merge new design into master