Improved layout
Added paths
Finish layout and routes