Fixing up margins to be dynamic