Completed more navigational features