Change controls position inside grid
Cleanup
Merge pull request #567 from lvv83/master
Merge remote-tracking branch 'upstream/master'