Changed imports for _base.html
Changed template structure