Design changes
Merge branch 'design_changes' into develop