fix scrolling issue over and finish last todo from tosi