Made navigation dynamic, moved to own file