Fixed the design
Finish layout and routes