UI improvements by Jim Lee (Rezn8d) integrated