Added questions generation and arrows