Finish the layout of site, fixed routing