Refactors tests and adds basic layout
Finish layout and routes