Update navigation and delegations
Fix display