Google + button added and fix some other issues