Reorganize and add to _exports
Also use 2-space tabs in Django templates