adding new logic for intro and better UI