Making sure users return to assignment selection after ending and assignment