Moved some grid variables to the config
Merge branch 'FormKit'