Temporary fix to scroll behaviour
Some linting changes