Made major changes to the template