Fix module block rescue

Tidied up the code a little, and fixed the author bug that was causing it to render the wrong template.