Fix UI problem