fix user bar moves at window resize
Merge branch 'develop'