Finally got services working with generators
Some tweaks to the nav component