switch to animation loop, add grid lines
Merge remote-tracking branch 'origin/dev'