Refactor
Add json to both templates
Refactor app, use less calls to get data.