Not using scrollwindow in GUI for map
Merge branch 'master' into ubuntu