Fixing top bar display issues