Added Select2 and UI cleanup