Reconfigured page to take advantage of a Router