rename some ids to classes
more specs and some commands