merged rezn8d's UI improvements