Moved some stuff around in the template