Removed unused views. Reorganized templates.
Small cleanup.