Fixes to wizard html templates