rearrage menu and html
Merge branch 'feature-view-mockup' into develop