Fix topbar issue
Merge pull request #4 from AppDojo/fix-topbar-issue

Fix topbar issue