UI issues fixed.