Added better toolbar and scroll sync