improve structure
Finish layout and routes