Some more UI issues fixed.