Bug 846075 - more social ui simplifications and fixes.  r=jaws