Finish layout and DRY tests
Finish layout and routes