bar z-index 100
Merge branch 'ui' into development