Ginish layout and routes
Finish layout and routes extra