fix commands to work with new user set
auto generate expandable list of the commands