5.1 add Layout
Finish layout and routes