ready for demo v0.1
navigation improvement & bug fix