fix scroll
change showing of messages
Merge branch 'develop' into gh-pages