fixed some shit
moved index, deleted duplicate templates stuff
fixed merge conflicts i hope