Added more metadata

More metadata, integrated tabs in template