close #5 fix navigation