Fixed answer checking
some template changes
more formatting changes
more template changes