Tidying up margins and padding