Modified like and dislike button behavior
Merged