Dev nd

Worked on users management, minor fixes