update tests
updating view
Finish layout and routes