Finish layout and routes | added tests | refactor tests
merge | run assets