Client UI changes for correct trapping mechanics