Update ClickHandler.java

- Changed code placement
- Changed tab usage