Identation corrections in base.html

Also untangled some interleaved tags and an unterminated input field
Merge pull request #320 from dsnellgrove/basefix

Some indentation corrections in base.html