Topbar Final fix #1