Toolbar rendering changes