MInor GUI XML cleanup