Numbering and border here

Numbering and border here also