added ids for easy ui testing fixing AGCORDOVA-6
Merge branch 'AGCORDOVA-6'