fixed css z-index
adjusted versions
Merge branch 'develop'