Improvement to toolbar sizing