route changes, front end changes
Merge branch 'routes/design'