Fix EditPicActivity to single activity