Update for Sprint 23's new toolbar layout

Inject top toolbar in a way that's compatible with Sprint 23's new toolbar layout (but also backwards compatible with earlier sprints).

Also fixes an issue with how the menu item was being inserted that caused a console warning. I preserved the current location of the menu item rather than the location the code seemed to be shooting for (the current location makes more sense to me anyway).