Bit styling and better content item settings
Merge branch 'cms' into cms_popups

Conflicts:
	folioport/templates/folioport/dashboard/layout.html