Updated CSS to account for struture changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/pagebuilder.css