Make a good start on the new template, user management is done, half way through group management