Major refactoring and renaming of things
Rename templates
Use more sensible URL names; Use url and reverse instead of hard coding the URL
Language
Clean up language; Fix some view bugs I introduced