Gem update
Additional work restoring sidebar behavior