merged Jim Rezn8d Lee's UI updates