Spacing and info field fixes