Apply math07's patch for taking padding into account in height="fit", fixes #1762
MInor GUI XML cleanup