Fix grid columns
Add controllers and services
Merge pull request #41 from theponti/develop

Develop