added click display and some beauty changes