fixed labels and added a better click event