Fixed another bug where the page was loading with old data due to the data being assigned before the callback function was done running. Removed the factory for this, and am now calling the  from the controller directly to make sure all the data is current and ready before the view is loaded.