Cleaned up base.tmpl