Reorganized Zinnia source, changed base.html