Added Select2 for exchange plus some enhancements