PM-570 : using ids instead of classes, changed version to 2.1.2