Like button changes
like button stuff
fixed conflicts