Some cleaning up
Fixed link on index