More small fixes
Reduced z-index values. Fixes #608