[finishes #57448196] - add padding and border