Merge with CXI
Scroll bar being set up