CHANGED:sort of minor modifications on UI elements and functions support