Update 0's to no units
Display formatted information on screen
Get JSON ready for display in the views
Merge branch 'feature/Display-Data-In-View' into develop