UI improvements by Jim rezn8d Lee