Added Cancel button and popup modal to all question screens