more cleanup on the individual view templates