Refactoring

Activation and Navigation behaviors now functioning as intended.