Added check for (toggle-scroll-bar)