basic fixes to the UI bug