fixing up the rest of the template