Switched to constant TOOLBAR_WIDTH