Refactored tests and routes
Finish layout and routes