Fix repeated question rendering
Fix how the questions are rended - also fixed a few other things
related when testing.