Synced changes and removed navmanager references

synced changes
removed navmanager references and commented code from app.js