app - re-though navigation, added plugin