Revert "Navigation Controller"

This reverts commit dbeb5587681dcbfe4b557a46dee9011121d5896f.