Implemented cleaner template inheritance.
Added suggestions to destroy_schema.sql
Merge complete