topbar + overflow fixes etc
mergefixes