corrected activity/view switching