fix style and improve user management