Bug noticed in scrolling
Added bounds checking
Improved EditPanel display