Refactored app to make less json calls, thus improving page-load time