Refactor layout to allow for custom spacing.