improve orrdering and selection of admin UI FMS-290