Finished code refactoring of reactive nav classes.