Fixed horizontal scrolling problem affecting toolbar positioning