Adding arrow navigation support and bullet support