Fixing code for slurping items into the inner nav, and added support for non-base object pages
Merge remote-tracking branch 'origin/feature/no-gutter-grid' into feature/no-gutter-grid