Changes to margin, more descriptive id's