refactoring user modal wrapper, sessions and current user