From Eldskegg: Yet another GUI update