Bugfixes

Fixed ZIndex issues introduced in lat commit