Some bungs fixed
Scroll bar added
Bugs fixed