updated view and test
Finish layout and routes