Putting UI changes into RHoK branch. I hope.