Fixed a few z-index issues.
Merge pull request #2145 from flukeout/zindexfixes

Fixed a few z-index issues, fixes #2120 and fixes #2091