Working through index page
fixed merge conflicts