Added border_inner_margin and border_outer_margin.