Template and view changes

Leaning the framework, slowly. See changelog.txt