remianing changes for scrollbar
fixing commits