kuan - fixed delete in CP, edwin update mainstoryboard