view edit and test refactering
Finish layout and routes