Refactoring of user management (ui)