Some UI bug fixes due to too short problem