added remaining routes and rest of layout