fix navigation (goldie's changes)