Moved some stuff around, made the template even better!