refactor job
added grid view
Merge branch 'grid-view'