updated the button for messages
update for margin top toggle btn
added remove button
Merge remote-tracking branch 'origin/master' into site-dev