add user fix
refactor action names
minor
reorganized everything in a single form
in progress - user criteria