Made some progress on the index page