Feature/backtothegrid

Bug fix: [no]
Feature addition: [yes
Backwards compatibility break: [no]
Unit test passes: [yes]
Behat scenarios passes: [yes]
Checkstyle issues: [no]*
Documentation PR: 
Fixes the following jira: