Added scrollability
Fixed conflicts added scrollbar