Ian: merge in scrollbar fixes