[UPDATE] (routes) Added a resolve to each route to load data first