minor template changes. All templates cleaned up