correct grid drawing, bar and assist bar
Merge branch 'develop'