Adding updated Buildingblocks and scroll fix