Some UI fixed.