Completed the layout structure
Simplify tests
Fisnish layout and routes