Updated version; fix navigation