Added bullet navigation support