replace contact plugin & some fixes