Changed json view
Merge branch 'setup'