Removed useless stuff, changed index template
Merged changes