Added screeen for the rest of test questions plus bug fix