add button click and some ui changes