Topbar.php and css updates