Added named routes and links to them
Fixed tests and finish layout and routes