V2.7- Resolved dropdown auto addition issue and incorporated code review changes

Resolved #167