Fix grid columns
Add controllers and services