Add border and label