merged with upstream, adapted mod
removed scrollbar for short content