Use named routes
Refactor tests
Finish layout and routes