Template cleanup.
Merge pull request #513 from glogiotatidis/cleanup

Template cleanup.
[fix bug 884007] Don't allow public groups.
Merge pull request #516 from glogiotatidis/public-groups

[fix bug 884007] Don't allow public groups.
[Bug 884496] Small style fixes for new styles.
Merge pull request #518 from juliaelman/884496-style-fixes

[Bug 884496] Small style fixes for new styles.