Updated toolbar to work responsively with new scroll