Added scrollbars + UI & Bug fixes