added labels and borders