Updated some activities to make cotnrol flow smoother