Refactor PreStageActivity