zindex fix
Merge branch 'feature/designfixes'