Navigation Controller Refactor/Cleanup/Delegation