all UI issues fixed