Bug fixes to routing and updated index page