Changed routes and added more layout
Fixed links