Security and navigation enhancement