lergo-158 : scroll position issue

lergo-246: comments
lergo-172: completion