added fb and twitter, remove cp name