Added total margin
Changed modal button bar to have gray background and border