Reordered settings and added additionl css classes.