Updates to ng templates for users and forms