Finish layout and routes
Added tests for this section