fixing top bar
Merge branch 'hotfix/top-fix'