Updated to use router and partial pages

Updated to use router and partial pages