#307 - Line up the labels with CSS theme