Get rid of the ArrangeOverride by setting MaxHeight/MaxWidth instead of Height/Width