Modify navigation and app structure