Correct handling of active/inactive nav items