Users view form refactoring