Add separate method for creating the border
Change border method to take color and width