View and template cleanup.