Counting on click View and some UI changes