contents margin fix

reverted changes to margins.
added additional fixes to make margins in color boxes right.
fixed margins of various elements to fit into the fix.