Fix UI problrms