minor fix in ui controls and logic