More test and view refactoring
Finish layout and routes