fillin layout
Finish layout and routes