New template

Changed template so it looks better
still needs some work