Layout changes and prettier tests and routing
Finish layout and routes