Use organization site navigation instead of global one but don't use tab content on dataset pages.
Remove unnecessary code
Correct breadcrumb in organization edit
Adapt to ckan core template changes