Update navigation
Close #2