Updated margins and border sizes