Fencing UI fixes and improvements