Fixed some bugs
Fixed index page