made changes to the template so they are actually working properly now