Fixes to toolbar and header-bar