UP-4198 Added room for labels so text does not overlap
UP-4198 Corrected a trailing class typo