Adding more to tutorial logic and popup widget