Reverting some ui changes