Adding HeightState and TopScrollState