reordered topbar fixed code
Merge pull request #2120 from GeorgePhillips/#2022

reordered topbar fixed code