More modifications to model navigator to use service layer

- Removed mockjax and some other things that have been moved to the service controller