Feature/new design

Merge updates for new design to master