Fix repeated question rendering

Fix how the questions are rended - also fixed a few other things
related when testing.
Fixes #19 and Fixes #27 and actually Fixes #13 too.
Possibly 31 but still need to check...