refactoring
refactoring and added click effect
fixed click effect