Fix some issumes
Solved some issue in scrool
Merge added scroll bar
Solved some issues
Ultimate update