tabs removed
Merge branch 'menubarimprove' into develop