Add option to not shuffle questions