UI issues fixed