Added social buttons
fixed conflict