Created dedicated drop-down UI control, integrated it and fixed some bugs.