latest changes including framelayout fix for scrolling