made some changes to fill out
Advanced layout
Finish layout and routes