Fix from issue #4379

I've updated the z-index of the .gh-main and update the settings-menu to behave correctly with the new z-index configuration.

I also gave the modal container a little space away from the nav bar to compensate for the z-index.