tiny bit if bug fixing and scrolling behavior