rapid redesign
new layout
Merge branch 'develop'