topbar and grid changes