Making layout prettier
Finish layout and routes