Cleanup template code to match.
Rearrange static files to fix glyphicons not showing up.