Standardized Navigation Class

See wiki for changes to option names