Change controls position inside grid
Merge pull request #567 from lvv83/master