fixed a usage bug
updated navigation states