Fixes to split toolbar