Fixed a couple of bugs
Fixed index page