Made some more modification to routing, based on accordian style home page.