ADEN-1597 Adding border