Fixed fb new layout bugs and support google+ new layout

Signed-off-by: Rack Lin <racklin@gmail.com>