order css properties, add i18n messages, adjust markup classes for new grid