make some changes to layout
Merge branch 'minor_changes_to_layout'
modify routes
resolve conflict