Added the main location  and resolve some issues withthe index page