Add field groups for better organization of user form