changed to putting everything within the label