Fixed the template view a little