Nav: convert markup to more generic classes