Mostly done
Fixed index page