FLUID-4970: Added end line to templates, changed on/off switch to use data-attribs for content, rearranged vendor/standard css