fixed margins and spacing

fixed margins and spacing, and added background colours