Issue rectified with re-order dropdown at unit setup.
Merge pull request #1871 from VinRudramurthy/dev-branch

Issue rectified with re-order dropdown at unit setup.